Work better when there is not enough space. This avoids a nasty size

2005-02-04  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkpaned.c (gtk_paned_compute_position): Work better
	when there is not enough space. This avoids a nasty size
	allocation loop in the file chooser.  (#154007, reported
	by Milosz Derezynski, patch by Robert Ögren)

diff --git a/ChangeLog b/ChangeLog
index 6fd1ed506e4238977a8a2389fe4b26ef39e2a83c..8c2ff2b33b9fccc860fc342143d689ff18738027 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@
        up comment to talk only about backwards compat, not
        forward/backwards compat. (#166293, reported by Vincent Noel)
 
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkpaned.c (gtk_paned_compute_position): Work better
+       when there is not enough space. This avoids a nasty size
+       allocation loop in the file chooser.  (#154007, reported 
+       by Milosz Derezynski, patch by Robert Ögren)
+
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6fd1ed506e4238977a8a2389fe4b26ef39e2a83c..8c2ff2b33b9fccc860fc342143d689ff18738027 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -4,6 +4,13 @@
        up comment to talk only about backwards compat, not
        forward/backwards compat. (#166293, reported by Vincent Noel)
 
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkpaned.c (gtk_paned_compute_position): Work better
+       when there is not enough space. This avoids a nasty size
+       allocation loop in the file chooser.  (#154007, reported 
+       by Milosz Derezynski, patch by Robert Ögren)
+
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6fd1ed506e4238977a8a2389fe4b26ef39e2a83c..8c2ff2b33b9fccc860fc342143d689ff18738027 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -4,6 +4,13 @@
        up comment to talk only about backwards compat, not
        forward/backwards compat. (#166293, reported by Vincent Noel)
 
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkpaned.c (gtk_paned_compute_position): Work better
+       when there is not enough space. This avoids a nasty size
+       allocation loop in the file chooser.  (#154007, reported 
+       by Milosz Derezynski, patch by Robert Ögren)
+
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index a6a4ef68239ac7b30f06356c6ca6674400f3f088..7ab84b44dc82528dca02074fb55f311910d8b289 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -1172,6 +1172,7 @@ gtk_paned_compute_position (GtkPaned *paned,
   paned->max_position = allocation;
   if (!paned->child2_shrink)
     paned->max_position = MAX (1, paned->max_position - child2_req);
+  paned->max_position = MAX (paned->min_position, paned->max_position);
 
   if (!paned->position_set)
     {